Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Dec 2011 10:51:30 +0000 (02:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Dec 2011 10:51:30 +0000 (02:51 -0800)
commit1fc7c59296692f485a91500c16b5440d3f525aa5
tree036cb359a1e952dd34206c2fdd08135f37d2a6c7
parentffa44af0cf6c4a0039703b8809505693ea419a8d
parent8cc8a5683e62b60f957049e9de6020c716e6a60a
Merge from trunk.
12 files changed:
src/ChangeLog
src/alloc.c
src/coding.c
src/editfns.c
src/emacs.c
src/fontset.c
src/ftfont.c
src/lread.c
src/nsfont.m
src/termhooks.h
src/window.c
src/xfns.c